Clear up and refactoring. But without grid configuration yet =(