Updating pages to keep in line with backend refactoring. Mostly moving conditions around.

Backend SHA: 960a46d9b856303bec80268f4d2b199604db24b8