Condense activity logic
Fix hour timezone bug