Continue UI implementation and clean-up