Merge "Change the task layout to better match mocks, add "in" animation"