Moved around some UI, added a unit test