Cleaned up some of the data displayed, added some UI clean
up and a little skeliton functionality