Closes #65. Closes #25. Also making a few UI changes too small to make issues about.