Fixed some UI issues. Also, committing before I head home.