Tweaked layout and animations