Major changes to vocab class. Main UI minor changes