Bug fix crash, make new views