Fixing some dependecies problems
GUI modifications