remove hash set & minor change in sidebar menu