Simplified layout a bit, added in contain and vertical centring modification through delegate