Add up and down spatial navigation for menus
Refactor code and clean up collision of duplicated work