Front End Improvements