Layout merge into staging

Completed layout with borders and ready to merge to staging