Fixed bugs on page 7