changed mockup, finished up to basic layout