Added charts and changed some functionality