Minor ui stuff and some testing.