Some tweaks to style and javascript loading