Cleaned up a few things for display of data and fixed the multi button problem