Bug and CSS fixes