CSS + JS fixes and some more stuff