Animation fixes, focus fix, button margin fix