Adding items to heads up menu
Cleaning up templating