Final commit - changed ui element attributes for better user experience