Fix 24 - Improve layout vertical centering