Updated views and javascript