Changed create button behavior