merging part of dev branch
updating css before debugging js issue