More Layout....trying to make the DRC happy...