Vastly improved layout