[FIX] Quick gui fixes (#38)