Modifications, fixes and clean up. Create and cancel buttons work now.