Updated layout and views