Merge "improvements to heads up interface"