master: setup new layout + context control coming soon