Updated views to fit new layout