Miscellaneous layout changes & minor error message improvements.