Merge the better UI

1. add grid
2. add some animations