Various pages improvements