Tony updat layout and reg types