UI Bug Fixes and New Features

Strictly speaking, these aren't finished, but close enough—I'll wrap them up in master.