Switch to GridView, work on animations