Cleaned up create dialog - still working on functionality