Clean up of UI and added Home page for / URL