cleaned up naming and added some descriptors and a refresh button