Fixing FTs i.e. locators change on report and role screen plus some refractoring