button stuff improved