Refactor to single page app design + some implementation
Clean up