css and js refactoring and enhancment