Fixed bugs, directions and timings  button changes