Updated layout and integrated view page