Hotfix to allow both times to be set independently

Changes a couple lines of code that were causing both times to be the same and fixes the spacing on the end time.