Fixed 2 bugs with arrow buttons