[Issue #188] [WIP] fixes documentation and modifies view