View issue 90% fixed!