Updated views and JS