bugs fixed, gui rearanged