Refactored pin layouts