quite a few view changes, fixes