Fixed animation and more android stuff