bug fixes and page format