[Issue #208][WIP] Salma fixed a button