fixed button stuff