Updated GUI's + misc