Added layout and view