I've given the new build a go and it's certainly an improvement! Good to have a reference for someone of my forgetful nature.
Thanks a lot for giving it another try and for the feedback!