Layout changes and a few fixes.