Reworked the front end to match the mocks