Restructured for page display