Layout improvements, shop improvements, gameplay improvements