Updated base layout, added and updated some views