Some page logic updates