Did some Tile and Loading refactoring