layouts
animation fixes (i think)
other minor things