adding labels and correcting minor bugs
using page context