Fix showing controls twice if there's only one!
Improvements to QOE entry