I think I have finally addressed all the remaining issues I had from the move. Please let me know if you find something I have missed. Thanks.

Adam