ReWrite using smaller cells and margens

Signed-off-by: Seth Rainsdon <srainsdon@nunetnetworks.net>