Added Menu and different states