Fixes for issue #27 #28

Click on clock icon no longer gives any bug and clickin on the stopwatch
icon no longer has the glitch.