Closes #34. A bunch of UI changes as well. In fact, this is a dan big update.