Added a few more GUI stuff