Up and Down buttons

And several minor fixes