fixed a few bug in the create screen and added some extra refactoring.