Gui improved

Some improvements and additions