Add wheel scrolling and fix where container is detected