#44 renamed buttons and also fragment container