Updated layout, started work on list view