Spreading the UI  around
More UI work