diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
index 19588cb11..eef71ac35 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
@@ -287,7 +287,7 @@ public class AddUpdateRolloutWindowLayout extends GridLayout {
             } catch (final EntityNotFoundException | EntityReadOnlyException e) {
                 LOGGER.warn("Rollout was deleted. Redirect to Rollouts overview.", e);
                 uiNotification.displayWarning(
-                        "Rollout with name " + rolloutName.getValue() + " was deleted. Update is not poosible");
+                        "Rollout with name " + rolloutName.getValue() + " was deleted. Update is not possible");
                 eventBus.publish(this, RolloutEvent.SHOW_ROLLOUTS);
                 return;
             }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java
index 456d7063f..0bd1ea899 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java
@@ -556,7 +556,7 @@ public class RolloutListGrid extends AbstractGrid<LazyQueryContainer> {
 
     private void approveRollout(final Long rolloutId) {
         final CommonDialogWindow addTargetWindow = addUpdateRolloutWindow.getWindow(rolloutId, false);
-        addTargetWindow.setCaption(i18n.getMessage("caption.approve.rollout"));
+        addTargetWindow.setCaption(i18n.getMessage("caption.rollout.approve"));
         UI.getCurrent().addWindow(addTargetWindow);
         addTargetWindow.setVisible(Boolean.TRUE);
     }
diff --git a/hawkbit-ui/src/main/resources/messages.properties b/hawkbit-ui/src/main/resources/messages.properties
index 5fc3de45c..4635cf32e 100644
--- a/hawkbit-ui/src/main/resources/messages.properties
+++ b/hawkbit-ui/src/main/resources/messages.properties
@@ -70,7 +70,6 @@ header.dist.twintable.available=Available
 header.target.installed = Installed
 header.target.assigned = Assigned
 header.type=Type
-header.swmodules=SwModules
 header.migrations.step=IsRequiredMigrationStep
 header.action=Actions
 header.action.run=Run
@@ -106,7 +105,6 @@ caption.action.states= Action States
 caption.action.messages = Messages
 caption.error = Error
 caption.new.softwaremodule.application = Configure New Application
-caption.new.softwaremodule.jvm = Configure New Runtime
 caption.new.softwaremodule.os = Configure New OS
 caption.filter.simple = Simple Filter
 caption.filter.custom = Custom Filter
@@ -119,6 +117,7 @@ caption.tag = Tag
 caption.type = Type
 caption.software.module = Software Module
 caption.rollout = Rollout
+caption.rollout.approve = Approve Rollout
 
 caption.create.new = Create new {0}
 caption.update = Edit {0}
@@ -137,7 +136,6 @@ caption.delete.target.accordion.tab = Delete Targets
 caption.delete.swmodule.accordion.tab = Delete SW Modules
 caption.delete.dist.set.type.accordion.tab = Delete Distribution set type
 caption.delete.sw.module.type.accordion.tab = Delete Software module type
-caption.attributes = Attributes
 caption.panel.dist.installed = Installed Distribution set
 caption.panel.dist.assigned = Assigned Distribution set
 caption.cancel.action.confirmbox = Confirm Action Cancellation
@@ -169,7 +167,6 @@ label.dist.details.type = Type :
 label.dist.details.name = Name : 
 label.dist.details.version = Version : 
 label.dist.details.vendor = Vendor : 
-label.dist.details.jvm = Runtime : 
 label.dist.details.ah = Application : 
 label.dist.details.os = OS : 
 label.modified.date = Last modified at : 
@@ -208,7 +205,6 @@ label.filter.text = Search Text
 label.filter.dist = Distribution,
 label.filter.custom = Custom
 label.target.filter.truncated={0} targets has been truncated in the list due the target size limit of {1}, use filters to reduce the targets to be shown
-label.active =Active
 label.inactive = In-active
 label.finished = Finished
 label.error = Error
@@ -313,7 +309,6 @@ tooltip.in.time = In Time
 message.save.success = {0} saved successfully
 message.update.success = {0} updated successfully
 message.delete.success = {0} deleted successfully
-message.dist.installedorassigned = Target {targId} is already assigned/installed with distribution
 message.dist.pending.action = Target {0} is already assigned with distribution  {1} . Pending for action
 message.empty.target.tags= No Tags Created
 message.empty.disttype.tags = No Distribution type tags created
@@ -370,24 +365,15 @@ message.mandatory.check = Mandatory details are missing
 message.target.duplicate.check = Target [ {0} ] must be unique, entered value already exists.
 message.target.whitespace.check = Please enter a valid controller ID with no whitespaces
 message.permission.insufficient = Missing permissions to perform this action: {0}
-message.error.temp = The operation cannot be fulfilled due to {0}. Please contact administrator
-message.dist.alreadyassigned = {0} : {1} is already assigned/installed, cannot be updated
-message.dist.tag.alreadyassigned = {0} : {1} is already assigned/installed, cannot assign/un-assign to tag
-message.dists.unassign.tag.alreadyassigned = Few of the DistributionSet's are already assigned to Target, those cannot be unassigned from Tag"
-message.dists.assign.tag.alreadyassigned = Few of the DistributionSet's are already assigned to Target, those cannot be assigned to Tag"
 message.dists.tag.assigned = {0} DistributionSet's assigned to Tag {1}
 message.dists.tag.unassigned = {0} DistributionSet's un-assigned from Tag {1}
 message.dist.no.operation = {0} - already assigned/installed, No operation
-message.sm.delete.confirm = Are you sure you want to delete the selected {0} Software Module?
-message.error.os.softmodule = Please select the OS to delete
-message.error.ah.softmodule = Please select the Application to delete
 message.error.softmodule.deleted = The selected Software Module is already deleted
 message.cancel.action = Cancel..
 message.cancel.action.success = Action cancelled successfully !
 message.cancel.action.failed = Unable to cancel the action ! 
 message.cancel.action.confirm = Are you sure you want to cancel this action?
 message.target.alreadyAssigned = {0} Target(s) were already assigned
-message.dist.alreadyAssigned = {0} Distribution set(s) were already assigned
 message.force.action = Force
 message.force.action.confirm = Are you sure you want to force this action?
 message.force.action.success = Action forced successfully !
@@ -400,7 +386,6 @@ message.action.not.allowed = Action not allowed
 message.action.did.not.work = Action did not work. Please try again.
 message.onlyone.distribution.assigned  = Only one distribution set can be assigned
 message.onlyone.distribution.dropallowed = Only one distribution set can be dropped
-message.error.missing.typename = Missing Type Name
 message.error.missing.typenameorkey = Missing Type Name or Key or Software Module type
 message.tag.cannot.be.assigned =  Target/DS cannot be assigned to {0}
 message.no.targets.assiged.fortag =  No targets are assigned to tag {0}
@@ -435,7 +420,6 @@ soft.module.os =OS
 message.error.noSwModuleSelected = Please select a Software Module
 message.error.multiSwModuleSelected = Please select only one Software Module
 message.no.duplicateFiles = Duplicate files selected  
-message.no.duplicateFile = Duplicate file selected : 
 message.delete.artifact = Are you sure you want to delete artifact {0} ?
 message.swModule.deleted = {0} Software Module(s) deleted
 message.error.swModule.notDeleted = Upload is running for Software Module(s)
@@ -454,10 +438,8 @@ upload.last.modified.date=Last modified date
 upload.failed = Failed
 upload.success = Success
 upload.swmodule.type = Type
-upload.artifact.alreadyExists = Artifact will be overridden as the given name already exists
 upload.size = Size(B)
 upload.validation = Validation
-upload.reason = Reason
 upload.action = Action
 upload.result.status = Upload status
 upload.file = Upload File
@@ -509,7 +491,6 @@ label.login.password=Password
 label.login.disclaimer=Privacy Notice
 button.login.signin=Sign in
 button.login.agreeandsignin=Agree & Sign in
-checkbox.login.rememberme=Remember me
 
 # Links
 link.documentation.name=Documentation
@@ -576,7 +557,6 @@ target.details.header = Target
 header.caption.mandatory = Mandatory
 header.caption.typename = SoftwareModuleType
 header.caption.softwaremodule = SoftwareModule
-header.caption.unassign = Unassign
 message.sw.unassigned = Software Module {0} successfully unassigned
 header.caption.upload.details = Upload details
 combo.type.tag.name = Type tag name
@@ -662,13 +642,11 @@ breadcrumb.target.filter.custom.filters = Custom Filters
 notification.configuration.save=Saved changes
 controller.polling.title=Polling Configuration
 controller.polling.time=Polling Time
-controller.polling.overduetime=Polling Overdue Time
 
 # entity not exist
 target.not.exists=Target {0} does not exists. Maybe the target was deleted.
 targets.not.exists=Targets does not exists. Maybe the targets was deleted.
 
-distributionset.not.existsDistribution=Distribution set does not exist. Maybe the set was deleted.
 distributionsets.not.exists=Distribution sets do not exists. Maybe the sets were deleted.
 
 targettag.not.exists=Target tag {0} does not exists. Maybe the target tag was deleted.