Mockup changes and remove the ugly buttons from home screen