Added todo and changed warning message to page info