Corrected menu bug, removed demo code