Added views and a layout