FIX: Some GUI fixes.