Some last minute changes to layouts.