Fixed CSS and other tweaks