Much cleanup and reuse of layouts