Finished page label bug fixes