Further styling and layout improvements