Updated MenuBundle branch