A few client feedback tweeks implemented.
Merge pull request #13 from MorganDawe/7.x

A few client feedback tweeks implemented.