Fixed some style and js issues