Added views and layouts