Changed layout and updated Views