Updated to better UI