Fix some page logic