final fixes for css and js