Fixed formatting and page breaking