Major Front End Design Refactor