Minor ui changes and back buttons