Improve page unification/design