added filter/sort

Filter and Sort option has been added in this. Also the navigationView
that was giving bugs has been merged with mainView. Still some bugs left
to correct