Fixed categories select mechanism
Deleted unneeded code
Fixed grammatical typo in button name
Merge remote-tracking branch 'origin/master'