layout improvements, spacing