Manually merged changes from mockup js/css