better scrolling
Fix menu position
Merge branch 'fredley'