Some generation views fix/changes