Overhauled layout