Changed layout and animation