Change tilesize to 16 and fix some markup