Bug fix and blueprint move to views