Arrows navigation, bug fixes