Frontend Improvements