Fixed ui on modals closes #1139 and fixed time off button for delete closes #1128