Safi page, js refactor
css tweaks