Added a better GUI