refactoring to match single page app
removed by refactoring