More cleanup of button css