remake
some weirdo button changes