Initial version of single page app related changes