Fixed the page layout and Screen transitions