Final commit

Button jumps, doesn't jump over the boundaries.