Working states, added menu classes