Added a cancel button and fixed a binding bug