Clean up some of the styling and remove some mockup values