Make page display logic more relaxed