More work cleaning up page