style and layout improvements