Properly handle menu prefix and suffix widgets

This was previously hardcoded

100 commits!