Enhanced the layout some more. #51