Updated CanteenApp