Lots of tweaks, changed the width, added animation