Clean up screen, add short keys, allow exit and refresh via key