Added buttons to the time popup
Fixed the modal