Fixes in gui