added two new tiles, revamped organization of location