Adds candidate mockup view and fixes some bugs.