Fixed few things in the view and hashtable function