Begin to fix global view