Merge "Changed edge back panels back to nav overview fixes various bugs"