major refactor of application layout page