master: added view management