Some fixes and layout changes.