Minor UI Issues fixed.Take 2