new stuff fixed buttons