[#55] Fixed up misplaced code/UI

...