Refactoring, bit of cleanup, improved layout of project create.
Merge remote-tracking branch 'origin/develop' into develop