Styling fixes, some nag markup changes.