Cleaned up initial version of single page app related changes