Updated with user guide
updated views to be nice