Refactoring and reformatted create dialog