Uncrustify pass
Fully implemented load/save of layout