UI work continues

UI work continues