Design consistency fixes and some JS fixes