UI and new pages changes