fixed display and js issues