Modified views and added javascript