More on interface changes... fixed alignment issues.