updated to accept content mode and some defaults as well as proper loading from both code and IB
Fixed bug where it wouldn't initialise the subview soon enough
Updated protocol parameter name
Merge branch 'tentative'