Small fixes and layout corrections.