Modified category window
Merge upstream/master
Modified category window (MERGED)
Merge pull request #16 from miriammariety/master

Modified category window