More UI/UX cleanup