Fixing activity labels
Fix dark theme on save report
Fixing padding metrics for handset factor
Merging with dark_theme branch