UI changes (replaced some menu items with buttons)