Fixed rotate and favorites bugs