Do some refactor. Add grid manager