Further cleanup in clutter calls

This fixes some visible styling issues and the use of some incorrect actor children in places.