Major layout revisions and bug fixes.