Recent UI work

Recent UI work