Added non-complete view changing