Update views to use new layout