Layout grunt work

Half time commit