fix cancel button
don't allow pressing ok with blank input
move things around