Fixed the button Ids