Updated views to push more common components into layout