Working out some of the kinks in the UI