More restrucuting, finished the signature grid page.