Issues #167 #168 GUI