Added buttons, need to be fixed