Changed some gui and naming stuff