Layout cleaning, menu upgrades, new settings