Fixed css and js issues