Better layout placement, added animations