Small changes
merge favorites
Stopped rotation and other small stuff