Fixed merged conflicts from menu branch