Fix scrolling, add keyboard shortcuts