Add translation on profiles
Add last fixes to buttons overall
Merge fix