Clean menu building & add ability to reject menu items