layout tweaks, and some animations