some rotation fixes. almost working
merge with new menu