Fixed menu scrolling and other minor things