Style and content improvements