Some gui and small changes