Merge branches 'humbucker' and 'humbucker' of github.com:blueriver/MuraCMS into humbucker
Fixing a few minor display issues