UI changes and added pages