format times
added edit modal and some other small changes