more UI re-working