Changed my UI mockup to fit style choices