syncing css and js from develop branch