Tile corrections
Merge branch 'ui_implementation'