Added snazzy fixes to the mockup