Fixed styles and effects in mobile
Fixed conflicts in merge