Style & Motion Fixes