Re-added the old layout with a button to switch between the layouts