Added mode selector, fixed bugs in progressive menu