(minor cleanup; starting some changes in layout files)