Fixed Again btn bugs