Continued implementation of UI work

Not done!