Updates to CSS and bug fixes