gui done

With these changes the gui should be done.