Revamping this layout for PDF