CSS and other ui related bug fixes