Improve app functionality, pull data to graphs