improve buttons