Updated GUI

I will add this functions later