LUN-871: Fixed the way menu template is found.

Some pep-8 fixes.