remove dead class
fix navigation initialy collapse
fix null pointer issue in query