Fixes to menu items rendering