Some fixes, and more loading of data moved to the server, instead of fetching it Ajax-wise on page load