Basic layout changed to 2 cell design