Closes #4 and #5. Minor UI bug fixes