Update wlc and make view handling non global