Fix some styling and usability bugs