Updated views for new system