updated some UI, most functionality complete