Minor UI changes and fix in app logic