Some fixes for AStar stuff.
Move labels in the menu to the appropriate place.