master: clean layout