Added correct weight handling for the buttons