bug fixes, page layout fixes.
merged