All pages working and cleaned up!!!