overhauled layout