refactor complete: moving tiles from render