redid ui, and other stuff