Fixing layout - 2005 complete!