Fix

Borders fixed, animations fixed