Updated various views and testing new view layout