Add missing const to equality operator
Finish porting layout object