Minor bugfix & GUI beggining