page layout changes and code cleanup