Alignment fix and set Ok as default button