fixed slight bugs and annoyances.
Fixed the "categories" dropdownlist
Merge remote-tracking branch 'origin/master'