Style and layout improvements