Added couple of GUI code. Not integrated yet