Minor UI Issues fixed