Make animation better
Better layout, still WIP
Fixes