Improved layout and missing p