Fix #28, fix #17 - restore wide view and fix flags