Some css fixes and cleanup