GPS watch fix & checkin button repositioning