Added (better) GUI