ticket:3 refactor the layouts for edit activity, move the OK/Cancel buttons