vastly improved layout