CSS tweaks and js change