More changes to try and get site working properly after first jQuery/AJAX action