Moved rotation to xml and switched to linear