Move UI components from base to objects, re-order