Changes to view and js validation