Update views and layout to twb v3.*