animations and cool ux things
some layout updates
merge