Updated with further layout / animations