Slight fixes for child themes, and general layout.

[branch: dev1.2.6]