Updated views to fix drop-downs