Many important fixes to CSS/JS