Major Front End edits