some minor design changes and tasks 'mockup'