Total Overhaul

Reset layout