Fixes for menu display