Issue #468 fixing indentation and view