making pin layouts flexible
merging in master changes