Page logic is now better.