Menu and Customer functionality
merged changes