Base layout complete

Getting ready for contact integration