Layout cleaning, menu upgrades, new settings

renames, cleaning and more