Fixed a few issues with flexible menus