Improving top nav and various tweaks
Updating edit query editor