Base: Minor UI/UX improvements