Fixed some width issues, etc.