Minor Update

* More housecleaning
* Looking to the future for more layout sauce