Actually improved layout