Adding front-end stuff from mockup