Final touch ups on contact layout