Updates menu items and some layout tweaks