js refactoring
css/js changes