Making the UI match the UI visual mocks