Add support for up/down in app selector & refactor/cleanup