SONATA-448 - Fixed menu display