Added a bunch of cucumber tests. Made small changes to views.