refactor
minor fix: OK/Cancel並び変更、lint 修正など