Changed layout and views