More js fixes and css