Mostly finished with the common layout
.hidden was being too aggressive