Cleaned up, bugfix for tiles display