Fixed the buttons that are displayed dynamically