Changed all the Display.getCurrent() to Display.getDefault() to avoid conflits + some global refactoring