cleaned up some code and new display on website