button management fixed