CSS and JS FIxes