Front End Refactored

Front End Refactor