Modified data page and added some report stuff