added styling changes
fixed conflicts
fixed pic animation
fixed conflict