Updated views with new fields and classes