Fixed the desktop->tablet bug, and made the animations fade to different images