Added views and layout