User stuff
Merge branch 'MinorFrontEnd'