Branch view code, break compilation with design work