Pull Request: Design_Akram_fixing_buttons