Minor UI changes
Minor changes for UI