FE: Some minor changes
Merge branch 'master' of https://github.com/jcarroll2007/Faces