UI/UX adjustments and improvements