cleanup navbar toggle
merge
fix inverse button