arrows navigation + bugfix