Fixed never ending pages and added icons