cleaned up all views: fixed sushi image consistency and wrapper stuff