Finish exercise Add page and correct logic