master: UI chanages