UI/UX Improvements