Moved to transitions for better android speed