Fixing css and js issues caused by git merge