organized, added view page