Add GridView to fix animation vertical issue