File rename
Added ui-all-or-one-view
Improved a couple of comments