NOBUG: Updating the table view to be a bit cleaner to my taste since it was hacked together initially.