Implemented more robust click handling and first draft of list view