OK + Cancel button fixed