Fix authorization
cleanup
Gui