Fixes in GUI