Integration with menu's and controls branch