Add menu basic menu system
Update DeepDish
Fix merge conflicts