Map design

Add designs and functions from various branches.